Главная Обзор Помощь
Зарегистрироваться Войти
J1X
/
huginn
Следить 2
В избранное 0
Ответвить 0

Просмотр исходного кода
update gems

Andrew Cantino лет %!s(int64=11): %!d(string=назад)
Родитель
2ba447d143
Сommit
437856895e
2 измененных файлов с 66 добавлено и 68 удалено
Показать статистику Diff
  1. 1 1
      .env.example
  2. 65 67
      Gemfile.lock

+ 1 - 1
.env.example
Просмотреть файл 

@@ -14,7 +14,7 @@ DATABASE_RECONNECT=true
14 14 
 DATABASE_NAME=huginn_development
15 15 
 DATABASE_POOL=5
16 16 
 DATABASE_USERNAME=root
17 
-DATABASE_PASSWORD=
17 
+DATABASE_PASSWORD=""
18 18 
 #DATABASE_HOST=your-domain-here.com
19 19 
 #DATABASE_PORT=3306
20 20 
 #DATABASE_SOCKET=/tmp/mysql.sock

+ 65 - 67
Gemfile.lock
Просмотреть файл 

@@ -35,14 +35,12 @@ GEM
35 35 
     activesupport (3.2.13)
36 36 
       i18n (= 0.6.1)
37 37 
       multi_json (~> 1.0)
38 
-    addressable (2.3.3)
38 
+    addressable (2.3.5)
39 39 
     arel (3.0.2)
40 
-    bcrypt-ruby (3.0.1)
40 
+    bcrypt-ruby (3.1.1)
41 41 
     bootstrap-kaminari-views (0.0.2)
42 42 
       kaminari (>= 0.13)
43 43 
       rails (>= 3.1)
44 
-    bourne (1.4.0)
45 
-      mocha (~> 0.13.2)
46 44 
     builder (3.0.4)
47 45 
     coderay (1.0.9)
48 46 
     coffee-rails (3.2.2)
 
@@ -51,42 +49,44 @@ GEM
51 49 
     coffee-script (2.2.0)
52 50 
       coffee-script-source
53 51 
       execjs
54 
-    coffee-script-source (1.6.2)
52 
+    coffee-script-source (1.6.3)
55 53 
     cookiejar (0.3.0)
56 
-    crack (0.3.2)
54 
+    crack (0.4.1)
55 
+      safe_yaml (~> 0.9.0)
57 56 
     daemons (1.1.9)
58 57 
     delayed_job_active_record (0.3.3)
59 58 
       activerecord (>= 2.1.0, < 4)
60 59 
       delayed_job (~> 3.0)
61 
-    devise (2.2.3)
60 
+    devise (3.0.0)
62 61 
       bcrypt-ruby (~> 3.0)
63 62 
       orm_adapter (~> 0.1)
64 
-      railties (~> 3.1)
65 
-      warden (~> 1.2.1)
66 
-    diff-lcs (1.2.1)
67 
-    dotenv (0.6.0)
68 
-    dotenv-rails (0.6.0)
69 
-      dotenv (= 0.6.0)
63 
+      railties (>= 3.2.6, < 5)
64 
+      warden (~> 1.2.3)
65 
+    diff-lcs (1.2.4)
66 
+    dotenv (0.8.0)
67 
+    dotenv-rails (0.8.0)
68 
+      dotenv (= 0.8.0)
70 69 
     em-http-request (1.0.3)
71 70 
       addressable (>= 2.2.3)
72 71 
       cookiejar
73 72 
       em-socksify
74 73 
       eventmachine (>= 1.0.0.beta.4)
75 74 
       http_parser.rb (>= 0.5.3)
76 
-    em-socksify (0.2.1)
75 
+    em-socksify (0.3.0)
77 76 
       eventmachine (>= 1.0.0.beta.4)
78 77 
     erubis (2.7.0)
79 
-    ethon (0.5.10)
80 
-      ffi (~> 1.3.0)
78 
+    ethon (0.5.12)
79 
+      ffi (>= 1.3.0)
81 80 
       mime-types (~> 1.18)
82 81 
     eventmachine (1.0.3)
83 82 
     execjs (1.4.0)
84 83 
       multi_json (~> 1.0)
85 
-    faraday (0.8.6)
84 
+    faraday (0.8.7)
86 85 
       multipart-post (~> 1.1)
87 86 
     fastercsv (1.5.5)
88 
-    ffi (1.3.1)
89 
-    foreman (0.62.0)
87 
+    ffi (1.9.0)
88 
+    foreman (0.63.0)
89 
+      dotenv (>= 0.7)
90 90 
       thor (>= 0.13.6)
91 91 
     geokit (1.6.5)
92 92 
       multi_json
 
@@ -94,50 +94,48 @@ GEM
94 94 
       geokit (~> 1.5)
95 95 
       rails (~> 3.0)
96 96 
     hashie (2.0.5)
97 
-    hike (1.2.1)
97 
+    hike (1.2.3)
98 98 
     http_parser.rb (0.5.3)
99 
-    httparty (0.10.2)
99 
+    httparty (0.11.0)
100 100 
       multi_json (~> 1.0)
101 101 
       multi_xml (>= 0.5.2)
102 102 
     httpauth (0.2.0)
103 103 
     i18n (0.6.1)
104 104 
     journey (1.0.4)
105 
-    jquery-rails (2.2.1)
105 
+    jquery-rails (3.0.4)
106 106 
       railties (>= 3.0, < 5.0)
107 107 
       thor (>= 0.14, < 2.0)
108 
-    json (1.7.7)
109 
-    jsonpath (0.5.1)
108 
+    json (1.8.0)
109 
+    jsonpath (0.5.3)
110 110 
       multi_json
111 111 
     jwt (0.1.8)
112 112 
       multi_json (>= 1.5)
113 113 
     kaminari (0.14.1)
114 114 
       actionpack (>= 3.0.0)
115 115 
       activesupport (>= 3.0.0)
116 
-    kramdown (0.14.2)
117 
-    mail (2.5.3)
118 
-      i18n (>= 0.4.0)
116 
+    kramdown (1.1.0)
117 
+    mail (2.5.4)
119 118 
       mime-types (~> 1.16)
120 119 
       treetop (~> 1.4.8)
121 
-    metaclass (0.0.1)
122 120 
     method_source (0.8.1)
123 
-    mime-types (1.22)
124 
-    mocha (0.13.3)
125 
-      metaclass (~> 0.0.1)
126 
-    multi_json (1.7.2)
127 
-    multi_xml (0.5.3)
121 
+    mime-types (1.23)
122 
+    mini_portile (0.5.1)
123 
+    multi_json (1.7.7)
124 
+    multi_xml (0.5.4)
128 125 
     multipart-post (1.2.0)
129 
-    mysql2 (0.3.11)
130 
-    nokogiri (1.5.9)
131 
-    oauth2 (0.9.1)
126 
+    mysql2 (0.3.13)
127 
+    nokogiri (1.6.0)
128 
+      mini_portile (~> 0.5.0)
129 
+    oauth2 (0.9.2)
132 130 
       faraday (~> 0.8)
133 
-      httpauth (~> 0.1)
131 
+      httpauth (~> 0.2)
134 132 
       jwt (~> 0.1.4)
135 133 
       multi_json (~> 1.0)
136 134 
       multi_xml (~> 0.5)
137 135 
       rack (~> 1.2)
138 136 
     orm_adapter (0.4.0)
139 137 
     polyglot (0.3.3)
140 
-    pry (0.9.12)
138 
+    pry (0.9.12.2)
141 139 
       coderay (~> 1.0.5)
142 140 
       method_source (~> 0.8)
143 141 
       slop (~> 3.4)
 
@@ -163,42 +161,42 @@ GEM
163 161 
       rake (>= 0.8.7)
164 162 
       rdoc (~> 3.4)
165 163 
       thor (>= 0.14.6, < 2.0)
166 
-    rake (10.0.4)
164 
+    rake (10.1.0)
167 165 
     rdoc (3.12.2)
168 166 
       json (~> 1.4)
169 167 
     rest-client (1.6.7)
170 168 
       mime-types (>= 1.16)
171 
-    rr (1.0.4)
172 
-    rspec (2.13.0)
173 
-      rspec-core (~> 2.13.0)
174 
-      rspec-expectations (~> 2.13.0)
175 
-      rspec-mocks (~> 2.13.0)
176 
-    rspec-core (2.13.0)
177 
-    rspec-expectations (2.13.0)
169 
+    rr (1.1.1)
170 
+    rspec (2.14.1)
171 
+      rspec-core (~> 2.14.0)
172 
+      rspec-expectations (~> 2.14.0)
173 
+      rspec-mocks (~> 2.14.0)
174 
+    rspec-core (2.14.3)
175 
+    rspec-expectations (2.14.0)
178 176 
       diff-lcs (>= 1.1.3, < 2.0)
179 
-    rspec-mocks (2.13.0)
180 
-    rspec-rails (2.13.0)
177 
+    rspec-mocks (2.14.1)
178 
+    rspec-rails (2.14.0)
181 179 
       actionpack (>= 3.0)
182 180 
       activesupport (>= 3.0)
183 181 
       railties (>= 3.0)
184 
-      rspec-core (~> 2.13.0)
185 
-      rspec-expectations (~> 2.13.0)
186 
-      rspec-mocks (~> 2.13.0)
187 
-    rufus-scheduler (2.0.18)
182 
+      rspec-core (~> 2.14.0)
183 
+      rspec-expectations (~> 2.14.0)
184 
+      rspec-mocks (~> 2.14.0)
185 
+    rufus-scheduler (2.0.22)
188 186 
       tzinfo (>= 0.3.23)
189 
-    sass (3.2.7)
187 
+    safe_yaml (0.9.4)
188 
+    sass (3.2.9)
190 189 
     sass-rails (3.2.6)
191 190 
       railties (~> 3.2.0)
192 191 
       sass (>= 3.1.10)
193 192 
       tilt (~> 1.3)
194 
-    select2-rails (3.3.1)
195 
-      sass-rails (>= 3.2)
193 
+    select2-rails (3.4.3)
194 
+      sass-rails
196 195 
       thor (~> 0.14)
197 
-    shoulda-matchers (1.5.6)
196 
+    shoulda-matchers (2.2.0)
198 197 
       activesupport (>= 3.0.0)
199 
-      bourne (~> 1.3)
200 198 
     simple_oauth (0.1.9)
201 
-    slop (3.4.3)
199 
+    slop (3.4.5)
202 200 
     sprockets (2.2.2)
203 201 
       hike (~> 1.2)
204 202 
       multi_json (~> 1.0)
 
@@ -206,11 +204,11 @@ GEM
206 204 
       tilt (~> 1.1, != 1.3.0)
207 205 
     system_timer (1.2.4)
208 206 
     thor (0.18.1)
209 
-    tilt (1.3.6)
210 
-    treetop (1.4.12)
207 
+    tilt (1.4.1)
208 
+    treetop (1.4.14)
211 209 
       polyglot
212 210 
       polyglot (>= 0.3.1)
213 
-    twilio-ruby (3.9.0)
211 
+    twilio-ruby (3.10.0)
214 212 
       builder (>= 2.1.2)
215 213 
       jwt (>= 0.1.2)
216 214 
       multi_json (>= 1.3.0)
 
@@ -222,15 +220,15 @@ GEM
222 220 
       eventmachine (>= 0.12.8)
223 221 
       http_parser.rb (~> 0.5.1)
224 222 
       simple_oauth (~> 0.1.4)
225 
-    typhoeus (0.6.2)
226 
-      ethon (~> 0.5.10)
223 
+    typhoeus (0.6.3)
224 
+      ethon (~> 0.5.11)
227 225 
     tzinfo (0.3.37)
228 
-    uglifier (1.3.0)
226 
+    uglifier (2.1.2)
229 227 
       execjs (>= 0.3.0)
230 228 
       multi_json (~> 1.0, >= 1.0.2)
231 
-    warden (1.2.1)
229 
+    warden (1.2.3)
232 230 
       rack (>= 1.0)
233 
-    webmock (1.11.0)
231 
+    webmock (1.13.0)
234 232 
       addressable (>= 2.2.7)
235 233 
       crack (>= 0.3.2)
236 234 
     weibo_2 (0.1.4)
 
@@ -238,7 +236,7 @@ GEM
238 236 
       multi_json (~> 1.7.2)
239 237 
       oauth2 (~> 0.9.1)
240 238 
       rest-client (~> 1.6.7)
241 
-    wunderground (1.0.0)
239 
+    wunderground (1.1.0)
242 240 
       addressable
243 241 
       httparty (> 0.6.0)
244 242 
       json (> 1.4.0)